From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 24 Jan 2011 17:39:45 +0000 (+0100)
Subject: BluetoothStatus: depend more on libgnome-bluetooth-applet
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8460
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c1ba920c86edb1f1530d031d53985e5b84c294cb;p=gnome-shell.git

BluetoothStatus: depend more on libgnome-bluetooth-applet

Ensure that a dependency is generated even when using --as-needed,
by adding a fake function that calls into the library.

https://bugzilla.gnome.org/show_bug.cgi?id=639324

Was accidentally removed, as part of the switch to building
a gnome-shell binary, reapplying the original patch. - Owen

https://bugzilla.gnome.org/show_bug.cgi?id=645596
---

diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index b922ca39c..1b2ccf69e 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -366,3 +366,17 @@ MetaPluginInfo *gnome_shell_plugin_plugin_info (MetaPlugin *plugin)
 
   return &info;
 }
+
+#if HAVE_BLUETOOTH
+/* HACK:
+   Add a non-static function that calls into libgnome-bluetooth-applet.so,
+   to avoid the linker being too smart and removing the dependency.
+   This function is never actually called.
+*/
+extern GType bluetooth_applet_get_type(void);
+void _shell_link_to_bluetooth(void);
+
+void _shell_link_to_bluetooth(void) {
+  bluetooth_applet_get_type();
+}
+#endif